bitkeeper revision 1.184.4.1 (3ead21dfzBuAoNqlxkTWXXsQKaDCyQ)

few build fixes

diff --git a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h
index 935ea3a6ef9b22e15909319719315bca880fadb7..47e2965fe0c9d22dd08bb18d665e41b629f4be89 100644 (file)
--- a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h
+++ b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h
@@ -11,7 +11,7 @@
 
 #include <asm/hypervisor-ifs/hypervisor-if.h>
 #include <asm/ptrace.h>
-#include <asm/page.h>
+//#include <asm/page.h>
 
 /* arch/xeno/kernel/setup.c */
 union start_info_union

diff --git a/xenolinux-2.4.21-pre4-sparse/mkbuildtree b/xenolinux-2.4.21-pre4-sparse/mkbuildtree
index 8749150889a58a199bf747335838cc408d92a9f3..38f76d7e2b8c6f9bae66228b075d71d748267c3e 100755 (executable)
--- a/xenolinux-2.4.21-pre4-sparse/mkbuildtree
+++ b/xenolinux-2.4.21-pre4-sparse/mkbuildtree
@@ -23,6 +23,7 @@ rm -f ${D}/mkbuildtree
 ## subdirectories.
 
 # This first symlink is special: it links to shared files in Xen's source tree
+rm -f ${D}/include/asm-xeno/hypervisor-ifs
 ln -sf `pwd`/../xen/include/hypervisor-ifs ${D}/include/asm-xeno/hypervisor-ifs
 
 # The remainder are the i386 -> xeno-i386 links